From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 7 Jul 2011 16:18:48 +0000 (-0400)
Subject: Merge from emacs-23 branch
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3026
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7c652bf456ef16bab043c9fc566a536a140c0210;p=emacs.git

Merge from emacs-23 branch
---

7c652bf456ef16bab043c9fc566a536a140c0210